From: Raspbian automatic forward porter <root@raspbian.org>
Date: Sat, 25 Feb 2023 18:24:37 +0000 (+0000)
Subject: Merge version 2.6.14-1+rpi1 and 2.6.14-4 to produce 2.6.14-4+rpi1
X-Git-Tag: archive/raspbian/2.6.14-4+rpi1^0
X-Git-Url: https://dgit.raspbian.org/%22http://www.example.com/cgi/%22/%22http:/www.example.com/cgi/%22?a=commitdiff_plain;h=0ad1ce9d7f56d0372f2f04e6b903e3d17f405f9a;p=gcl.git

Merge version 2.6.14-1+rpi1 and 2.6.14-4 to produce 2.6.14-4+rpi1
---

0ad1ce9d7f56d0372f2f04e6b903e3d17f405f9a
diff --cc debian/changelog
index 7f391a4e,c8e5936e..2e73a402
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,12 -1,20 +1,30 @@@
- gcl (2.6.14-1+rpi1) bookworm-staging; urgency=medium
++gcl (2.6.14-4+rpi1) bookworm-staging; urgency=medium
 +
 +  [changes brought forward from 2.6.12-83+rpi1 by Peter Michael Green <plugwash@raspbian.org> at Wed, 24 Jul 2019 23:08:39 +0000]
 +  * Make an error message more explicit.
 +  * Use the "arm" not the "armhf" relocations code,
 +    the "armhf" code is intended for systems that use thumb, which raspbian
 +    doesn't.
 +
-  -- Raspbian forward porter <root@raspbian.org>  Thu, 19 Jan 2023 12:46:58 +0000
++ -- Raspbian forward porter <root@raspbian.org>  Sat, 25 Feb 2023 18:24:36 +0000
++
+ gcl (2.6.14-4) unstable; urgency=medium
+ 
+   * Version_2_6_15pre3
+ 
+  -- Camm Maguire <camm@debian.org>  Tue, 14 Feb 2023 08:20:37 -0500
+ 
+ gcl (2.6.14-3) unstable; urgency=medium
+ 
+   * Version_2_6_15pre2
+ 
+  -- Camm Maguire <camm@debian.org>  Mon, 13 Feb 2023 10:42:54 -0500
+ 
+ gcl (2.6.14-2) unstable; urgency=medium
+ 
+   * Version_2_6_15pre1
+ 
+  -- Camm Maguire <camm@debian.org>  Sun, 12 Feb 2023 18:35:20 -0500
  
  gcl (2.6.14-1) unstable; urgency=medium
  
diff --cc debian/patches/series
index 73b61517,0472be7f..3c4c1baa
--- a/debian/patches/series
+++ b/debian/patches/series
@@@ -1,2 -1,3 +1,5 @@@
+ Version_2_6_15pre1
+ Version_2_6_15pre2
+ Version_2_6_15pre3
 +make-error-more-explicit.patch
 +dont-use-armhf-relocs.patch